babl: re-enable earlier bailing for big path errors
authorØyvind Kolås <pippin@gimp.org>
Wed, 20 Dec 2017 02:22:00 +0000 (03:22 +0100)
committerØyvind Kolås <pippin@gimp.org>
Wed, 20 Dec 2017 02:25:28 +0000 (03:25 +0100)
This is one way of dealing with 790658 - that in general is a good idea as
well.

babl/babl-fish-path.c

index 6a1e1941e5b6284fa62acc4f945348b92e1490bc..4b087fcb4c77e9a4a8ac925d51cafc351f6538de 100644 (file)
@@ -210,7 +210,7 @@ get_conversion_path (PathContext *pc,
       double path_cost  = 0.0;
       double ref_cost   = 0.0;
       double path_error = 1.0;
-#if 0
+#if 1
       int    i;
       for (i = 0; i < babl_list_size (pc->current_path); i++)
         {
@@ -219,7 +219,8 @@ get_conversion_path (PathContext *pc,
 
       if (path_error - 1.0 <= legal_error )
                 /* check this before the more accurate measurement of error -
-                   to bail earlier */
+                   to bail earlier, this also leads to a stricter
+                   discarding of bad fast paths  */
 #endif
         {
           FishPathInstrumentation fpi;